merge trunk
authorK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:03 +0000 (09:24 +0900)
committerK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:03 +0000 (09:24 +0900)

Trivial merge